From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 2 Apr 2009 06:53:11 +0000 (+0100)
Subject: x86: A further fix to paging_log_dirty_op() -- do not unmap_domain_page(NULL)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13989^2~14
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=58740d22ab313771dc1a8829f69a17e620a2d3e4;p=xen.git

x86: A further fix to paging_log_dirty_op() -- do not unmap_domain_page(NULL)

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index 0df7376c24..e9313e14f1 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -430,7 +430,8 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc)
         if ( l3 )
             unmap_domain_page(l3);
     }
-    unmap_domain_page(l4);
+    if ( l4 )
+        unmap_domain_page(l4);
 
     if ( pages < sc->pages )
         sc->pages = pages;